From 0f98f225d1b81e0c8bd0bbcf901ef8368bdde096 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Wed, 16 Dec 2015 19:24:51 +0100 Subject: [PATCH] GtkWidget: Add some ignore deprecation statements We still need access to floating devices here. --- gtk/gtkwidget.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 40999de737..f5893d715a 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -12586,7 +12586,9 @@ list_devices (GtkWidget *widget, GdkDeviceType device_type, GList **result) { + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; GList *devices = gdk_device_manager_list_devices (device_manager, device_type); + G_GNUC_END_IGNORE_DEPRECATIONS; GList *l; for (l = devices; l; l = l->next) @@ -12620,11 +12622,14 @@ _gtk_widget_list_devices (GtkWidget *widget) g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); - display = gtk_widget_get_display (widget); - device_manager = gdk_display_get_device_manager (display); if (!_gtk_widget_get_mapped (widget)) return NULL; + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + display = gtk_widget_get_display (widget); + device_manager = gdk_display_get_device_manager (display); + G_GNUC_END_IGNORE_DEPRECATIONS; + list_devices (widget, device_manager, GDK_DEVICE_TYPE_MASTER, &result); /* Rare, but we can get events for grabbed slave devices */ list_devices (widget, device_manager, GDK_DEVICE_TYPE_SLAVE, &result); -- 2.30.2